ipv6: Fix ABI change in 4.4.4

Change ip6_route_output() back from a static inline wrapper to a proper
extern and exported function.

Gbp-Pq: Topic debian
Gbp-Pq: Name ipv6-fix-abi-change-in-4.4.4.patch

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 295d291269e2c88ed4930041597a28f7c9a7a2f7..5a01582452206b5e582af796659b209e10d7cd7d 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -66,13 +66,8 @@ void ip6_route_input(struct sk_buff *skb);
 
 struct dst_entry *ip6_route_output_flags(struct net *net, const struct sock *sk,
                                         struct flowi6 *fl6, int flags);
-
-static inline struct dst_entry *ip6_route_output(struct net *net,
-                                                const struct sock *sk,
-                                                struct flowi6 *fl6)
-{
-       return ip6_route_output_flags(net, sk, fl6, 0);
-}
+struct dst_entry *ip6_route_output(struct net *net, const struct sock *sk,
+                                  struct flowi6 *fl6);
 
 struct dst_entry *ip6_route_lookup(struct net *net, struct flowi6 *fl6,
                                   int flags);

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 3f164d3aaee2eaa7aa246d6c100ef405fd3016e0..e7b1889ba72a52737b77fa5177635e5bdcdbc3fb 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1200,6 +1200,13 @@ struct dst_entry *ip6_route_output_flags(struct net *net, const struct sock *sk,
 }
 EXPORT_SYMBOL_GPL(ip6_route_output_flags);
 
+struct dst_entry *ip6_route_output(struct net *net, const struct sock *sk,
+                                  struct flowi6 *fl6)
+{
+       return ip6_route_output_flags(net, sk, fl6, 0);
+}
+EXPORT_SYMBOL(ip6_route_output);
+
 struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_orig)
 {
        struct rt6_info *rt, *ort = (struct rt6_info *) dst_orig;